Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 19 Nov 2011 07:15:21 +0000 (23:15 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 19 Nov 2011 07:15:21 +0000 (23:15 -0800)
commitb8818c8c5493e561e07a8ed231f3d895d596caee
treea62bbd20935a6b736b001edc2a1aef68286277a2
parentc58c885532a6685ff2c166917f31321f3dadea33
parentad6ca033e2cf2956252002e1b18f83a956e69339
Merge from trunk.
src/ChangeLog
src/dispextern.h
src/dispnew.c
src/xdisp.c